Re-did speed calculations to be done purely in fixed-point since speed accepts it