Revert "Copied Kenneth's Changes"

This reverts commit 813b75d001694a11122c4e3c70356f38c978b3a9.
Steven's Changes