Continued working on roxygenizing.