Upgraded with latest merge2