World will be ready for some 2021 Olympic spirit