upgrading
combinging templates