more work and changes