Reorganize section 2