Reduce wait times