rev 17 to one table