AMS - minor changes in model