Update to latest ZAM