Revert "Revert "Efficiency improved""

This reverts commit 069bd1b0bdcf902050bc2ca60681e83c89ea5026.