CS + minor change