AMS - minor changes