Revert "Revert "Not working properly -> limits => broken others""

This reverts commit fa5db5c1bf61f30e14643cefeea37aced37dbe71.
Limits are working properly