Jesse's Updates
Revert "Jesse's Updates"

This reverts commit 631788bfd0eb60c39fb5a3fe2e6f5324d2bcca81.