Edits from Melanie, line wrapping