Hand updating to allow merge compatability