Revert "General Update 2"

This reverts commit fc1aa9befd38854ca2daaccc71acdec0bf7455b5.