- tweaks after testing