Should be faster too
Fixed