edited templates for consistency