MBH: updating classes