Added Template Changes