adjust to follow CS