I also had to duplicate the OGCD weaves multiple times next to their GCD triggers as well else it's just a nightmare. Makes it much better, although at the coast of some hotbar bloat.