At Okayama University, along with the research and graduate students enrolled in the Japanese Language classes, there has been a growing number of exchange students. In order to accommodate students with diverse backgrounds, we undertook a drastic curriculum reform despite making yearly adjustments. We began to offer various topic-based elective classes in addition to the integrated classes offered. As a result, students now can take classes that suit their interest and have more choices on the number of classes they take. In this presentation, we will report the process of our needs-analysis, the reform and changes in the new curriculum, and then, discuss further issues based on the post-reform survey.