Revert "Revert "BIG Update - Slow performance fixed""

This reverts commit 0c7c06a075a6bdc37d0ba7df18ec92f704d8af20.