Combined rev. 1 and rev. 2 into a single table.