#3 bug fix and few change revert