Refactored modifier.
Done with modifiers.