Minor mods to AMP (still only test)