Olympics pushed to 2021, partner changes coming