Updated with new template