Improve booking system

Booking system is ok