more changes
more changes on templates files.