Translated to CS and other updates