Revert "Fixes"

This reverts commit 83512ab86192f8265123711b950d35be464d8b2e.
Revert "Major Update"

This reverts commit 5e7ec13915827dbf71dd8cf53ff07ab74e2784d5.