* small changes in template