Final edit from KD