Refactor to include floats