Template

improvements template