Chaupal tools tested with update sites
Improved templates