On track for Tokyo 2020