MBH: refactor