AMS Code Review Update 3