Revert "New Changes"

This reverts commit 0449502139bec0126c4d8246cd95cdadfd365258.