Replaced time offsets with calculated timeouts everywhere