changes renamed to diffs to avoid naming clash, fix to modified item logic