template updates for consistency