bugs removed related to templates
bugs removed related to templates