further renaming of variables; put EM and VBEM into the same framework