Change cascade type + small changes