Major update

Played with templates