final tweaks before testing