Mutator splitted up