Updated Iwata's function to the new interface