Revert "Revert "Revert "New added changes"""

This reverts commit 40396623dd17c0024835e29aa7e5077904ca4b9d.