fixed up template