better cb handling