Refactored
v1.2.0