3rd checkin- before migration