Add chnages to checkin logic