Refactored 1.0