template refinements from yesterday