Lots of changes, now done