working and clean version checkin