Reverting and adding some changes