Testing..
Revert "Testing.."

This reverts commit 4a1f7018cdf11097a72805ffcce6683f4d119079.
Performance optimizations