Improve KYOTO