On time for the Olympics