With improvements for hayabusa