refactored section + yields