refactored one section