controller handling CS

Need to be tested