Lots of changes. continuation of re-structuring.