Adjusted template after first use...
Some improvements