fixed code for yoshida