reversed some changes in previous commits