Reverted last 5 commits