Merging from master and generating for beaker part 3