Revert "make a few changes"

This reverts commit bdd49cd4efe9e37117a9be8e0f5fc957b1d1617a.