Small Changes to template