Use floats for calculating deltas.
Fixing merge conflict.