Updates to the wait times, really needs testing