add runTime master calculation, adjust templates