Various Changes
Revert "Various Changes"

This reverts commit 13839730e8e6fd78e83b4a70525ef72a04b477b3.