Just in time for Vancouver