Changes to OUTLINE based on feedback from Chris Skalka.