Template pages from Ahmad's work
Solved merge conflict