Update to latest ammat