lots of changes, more work to be done