Changed order + fixed azmodan category