Many Upgrade Performance & Bug fixed