MBH: active development
MBH: merging sams fix