Revert last 2 commits
Minor changes