Few more tweaks before testing