jhnsdfsdjfOL
Revert "jhnsdfsdjfOL"

This reverts commit aec69c3cc1c6da014ba3691259793660fc9d5467.
Revert "Revert "jhnsdfsdjfOL""

This reverts commit 7225463b305af0e47f573481b4a6938a7f303b71.
cleaned up the code a bit