Updated line wrapping