Changes for issue 26 - oXygen vs Oxygen.