multiple changes to upgrade to bblcommon 1.8 and reorganize for clarity