Revert "Some new modifications"

This reverts commit 154f90aa3bd29434e72d476ff7bd0fdc1667d6fd.