Mutation refactored

Options fixed