Changes on text and template