Booking logic improved