Changes for floating point only