runner optimization
builder refactor