Updated for latest VBE overhaul