For #5 : add rowspan