Refactored
1.0.0