upgrade framework , more scenario