separated trip and checkin functionality