CBC + minor core.py changes