Added accept/cancel booking functionality and starting on S3 upgrade