footer updates
merge 2:32