If the order of procedure was weapon effect resolve then upgrade effects it would fix the issues of random gems breaking up alignments, also unsure what issues exist with gem destroy upgrades but might help those as well
2 Likes