Ok I edited my CS and Mech accordingly so have a look at it tell me if it is ok now.