runner is now much more robust