template updates + system_message addition