more code edits