Made more changes that should be published