changed to use new speed calculator