Initial update with firs two templates