Merged Beaving

Merged Beaving changes