More Gen 6 move changes