some changes in template, base added