Update Prof. Ohiwa's rewrite