Updated for latest VBE