Initial changes implemented
Revert "Initial changes implemented"

This reverts commit 43a1698bdecc2f60e9245f640bd1e9d4ba46d682.
Revert "Revert "Initial changes implemented""

This reverts commit d056040756b3b8b2cc1f7f704f6c96dd7507e506.