Part 2 of the beaver build