MBH: resolves #3 and #4