Fixing groovy conflict
Handling BB all-in (related to Issue #11 on original project)