Back to float, some renaming