first refactor checkin