made changes to match new BamM