Revert "Revert "Revert "Small modifications"""

This reverts commit e9b873bb14e8f76c9d55bcc39727c28ca2b2de84.
Revert "Revert "Revert "Revert "Small modifications""""

This reverts commit d3cb49f9d5450a3665766699609fe1c3f5d8ac60.
Revert "Revert "Revert "Revert "Revert "Small modifications"""""

This reverts commit 2a38d3e3b2720ce4726767b39c5fb3ca02f6ec76.
Reverted Deletion