lots of detail changes