Final tweaks before testing round 1