ADDED Tempalte functionality