Revert "Reverted some things"

This reverts commit 0afd62e354e97a380ca7482c1916f352aaea5ef5.