The End of the General Upgrade