CS done and updated