Solves issue #1, speed compensation