Revert "Revert "More changes""

This reverts commit 0a4dbf33b824e6382ef08d460e95dff188e2ec78.