add float feature in the function2
fix some problem in the function2
fix the comflicts