Updated with latest template & data