some templatechanges