fixed templates
ready for presentation