yellow
improving template structure