BROKEN - refactoring to use generated rows