fixed templates with demo code I forgot