Remove the additional loading of the data when it is not strictly necessary. This follows the improvment Karen made in speed.