Here is the new data option, since this diff is pretty hard to read.