A little bit more work on how to handle runs