Updated to Runner overhaul