update for new table layout