First test with new speed calculation.
DON'T USE THIS CODE!!!