killed more conditionals in runner