lots of changes -- I'm a bad historian :(