complementary changes in the template..