Redesign of Average Files facility.