move cahnges to templates