Updates to CS code, CS 3