small tweaks for timing