Old version merged, changed to new version