new tempeleting style implemented
merged with Talak's commit
Merge origin/master