Changes in the template and removed console statements