Refactored #checkin