Some adjusting (float numbers again)
some bug to solve