start of merge from old