Changes to float - part1
After merge