and ditto for basically the rest of the diff as well