Updates to CS3