Translation edited
merge from kadish