Added InnerMul and reordered cases structure