removed wrap + added more sections