Updating: improving ATS2-contrib/AVR