CB changes, reverted
merging chris's changes