reverting 3 commits