Added Hiro's class.