Revert "Revert "Changed parts""

This reverts commit fa1ba0d8259169e53a75b8aa9f26bb743003670a.