THE ENERGY FACILITY COMPONENTS: A REVISED SYSTEM FOR MORE EFFICIENT SERVICING