Nice improvement to Maho.