edits to reduce dependencies