refined templates, updated day two