Revert "A few changes"

This reverts commit e649c0c1c12c3c992a22a655e3014522f703159c.
Revert "Revert "A few changes""

This reverts commit ff06e01cb0a96b1875ceedc55b36eb58f0e9189b.