Added efficiency changes