Lots of changes, lots of new figures