Improved Checkin Functionality