futher integration with new template