matched the section headers with the template
fixed conflicts in implementation