Updated
Fixing the templates