AVM design changes