Changes for twig