Revert "Constants fixed"

This reverts commit a84a12e129416929c23b820b4983f0f601f2d684.
Revert "Revert "Constants fixed""

This reverts commit 487164d2b2c8f0db3104ec5e1a29bb65e9e99073.