more work and left comments