Handle wrapping better in several sections