Integrated Helene's change suggestions