Updated with changes highlighted