fix to timing issues, don't touch them again

All functions working