changes before merging kevins upstream/master into footer