Add Hiroki's code