Refactored
Fixed float bug
Latest build