Revert "Some changes 2"

This reverts commit f5fe00f98e30622f075d9b798d9b8140fa03236a.