Anyone know how to include the `when ordered by fi...