Reverting back last 7 commits