Fixed CS

Take care it's a big one