template simplification
template adjustments