removing more redundant code.
more consistency with s, p and this_start_row