major update that should prevent all overbookings