Garnet and Qiaoni changes