improved runner code