Reversed some changes