Making checkin nicer