changed ints to floats to deal with decimals correctly