better pre-21 compatibility and changed rows layout