Efficiencyfix

Efficiency changes have been made.