changes to the way the wait timer works