Done improvement KPD-471