Updated to go with new tables.