(update-table-component) made changes from PR comments