Revert "Revert "Revert "Lets add some optimzation"""

This reverts commit 9902dc5a6d59ac62f092aed0c9337c3b265112ae.