Small change to make regenerating all this info faster...