added an extra BB condition
more