Make movement better, still not the best