Added more buffer to wait times