This is the production trunk for amii: version 2.0 and above