Cb user changes

User changes for CB - should be safe for wider use