small tweaks in timing