Added move speed calculations