Release/bb refaktor