Revert 9dd4776..5dc81ce

This rolls back to commit 9dd47761fb31228314c96a756f4297e95cab0e1d.
Revert "Revert "-Minor changes""

This reverts commit 5dc81cec4e8a81358d617e33f87581ef61b42322.