Reveresed some changes