small changes to aams basics