Translated and fix up