Modified CS scripts to match current state