Upgraded to Assemblage 1.7