modified -- added twig blocks