updates for as7 assembly