Revert "Revert "just some stuff""

This reverts commit 0777353a1a447a502286da9ca242eb29f5da7f74.