major overhaul of avo framework