Updated with table