Changed CS-specific changes in prep for pull request