yet some more edits required