Add panting when running
Add better running behaviour