CPU hogging fix again
template-based project types?
builder-based project types