--Added capability to handle floats