finally! got the speed calcs right