Needs to improve check in process