Slight Change To Reduce Calls in Wait