Alrighty final changes to CS are done