Changed the Templates