Add new features from Mario/mutators (will integrate them better later)