removed built-in units support; shifting to AO convention