Minor tweaks making it closer to a "basic" runner