upgrade for agal2 max, fix null swiz component going unnoticed