Revert "Revert "Some changes""

This reverts commit 073ce4aa2d7162ff7e5256b308fd7e7d951bfb5e.