moved changes to dev branch

This reverts commit 05c4e79c675967a426ec39b73c9f93fb0c5ca966.
Revert "moved changes to dev branch"

This reverts commit a0b7df95d536ef96fa8236641ba50860edfb2501.
Revert "fixed code"

This reverts commit 05c4e79c675967a426ec39b73c9f93fb0c5ca966.
Reverting to distribution build