Updated for Yi remake patch