[DF-563] implemented completely, tested in windows