uncommited code from BB
resolved conflicts on BB