Correction of Interface and Code