Ahead of the 2020 Tokyo Olympics