Reverted to use the actual table.