Revert "Revert "For the dev's""

This reverts commit f1300432e6e852b3d95878597a89dbe009358327.