Updates to C4.1