Upgrading the Advanced Photon Source