Updated for Table