Adjusting templates Jefferson/Carlos