security and template changes