Slight improvement over these templates.