lots of updates to match the original version of site