First section improvements