Efficiency changes WIP

Efficiency changes WIP