Revert "Revert back to original i think issue is fixed now"

This reverts commit 232bfeccbfbb2b0596e12bb086d5ece02664356a.
some changes