list templating improved