Refactored volusion order