Template updates from meeting on June 5