Update to Booking (Not finished)
Merge