Fixed last section
Added more