Bad
Revert "Bad"

This reverts commit 10f722ac1b1fa44ef9bf57de92d70b12e20dc60f.
Fixed it
Fixed it more