Keeping a few ordering changes