improved some of the wording, using cached results