Reverted the last 3 commits