updated for new core template replacing older one