Taken away the ipolation + little changes