Refactored
New version v1.2