add from ex-1.37 to ex-1.39