Added something ill remove later
Revert "Made it more tidy"

This reverts commit 1eff6d7aa160c76fe0a8b1421b63abe8e6cdf232.
Revert "Added something ill remove later"

This reverts commit 082297f34c5f2b78ed0c98f438d390b43075a820.
Revert "Revert "Made it more tidy""

This reverts commit ba23421a910c3f29a4a88e2e4e43e8b39f6e36f1.