add custom templates and orther  changes