Improve stomp work