Revert "Many Changes"

This reverts commit c3a74c15f0d0851346ce534a55721a03001350bd.