Refactored v10