woosh, so many changes.  going to fast I can't keep track