new version
 merged version