Updated with a column for manual editing