Revised row selection function, added outline for 3.2