Updating SHIVA to Bill's latest code with corrections to graph and including update to timeline.htm posted earlier