Updated runner to avoid duplicating locals