Small opti
Revert "Small opti"

This reverts commit 7488b8802915ae97cb746b86f453018d21ac2b86.
Revert "Revert "Small opti""

This reverts commit 49ffcbf1682268f4af964df8c49f3beb7bb35824.