Revert "Made more modifications again"

This reverts commit 2a13e9a47daefd9419745b113fcec0a15c3e4e84.