Work on these two templates to make the produce correct output