Modifyed templates