Reverted last 3 commits