Re-sectioned per Olafur comments