runner fixed (wip)