Implemented all of the Boncuklu changes