template rendering changes