Revert "Revert "Just cant get rid of this""

This reverts commit a36631c00265bb37e1ac19d5a5d654c0d78fcdcd.