added templates
Removed cached