Improve basic running