most recent changes, diff for gridlock