Template modification

and few others
Template
Revert "Template"

This reverts commit b3c407d7ed49d6b4db4b1876f88e7a163cd7a642.