Reverted to older stuff

problems with 'rows' union. reverting to have working code