remaining changes of prev checkin