Revert "Efficiency improved"

This reverts commit 7b44a08f3344634bc26a82105d79c9c2c938c3d9.