diff --git a/roadmap.md b/roadmap.md
index 94ffe6c0b..14ef38625 100644
--- a/roadmap.md
+++ b/roadmap.md
@@ -9,24 +9,42 @@ The goals of future milestones are fluid until we begin that development cycle,
 so the exact milestone for future features is not pre-determined.
 
 Candidate features for future release cycles
- - MediaCapabilities to make performance-based decisions
-   https://github.com/google/shaka-player/issues/1391
- - Codec-switching
+ - HLS performance improvements
+   https://github.com/google/shaka-player/issues/3363
+ - HLS interstitial support
+   https://github.com/google/shaka-player/issues/3364
+ - Integration with Google Video ML/Cloud AI
+ - Support containerless formats
+   https://github.com/google/shaka-player/issues/2337
+ - Support ID3 tags in mp4
+   https://github.com/google/shaka-player/issues/3351
+ - MSE support for FairPlay
+   https://github.com/google/shaka-player/issues/3346
+ - Codec-switching and order preference
    https://github.com/google/shaka-player/issues/1528
+   https://github.com/google/shaka-player/issues/2179
+ - Configurable key-system priority
+   https://github.com/google/shaka-player/issues/3002
  - Preload API
    https://github.com/google/shaka-player/issues/880
  - Thumbnail tracks
    DASH: https://github.com/google/shaka-player/issues/559
    HLS: https://github.com/google/shaka-player/issues/2429
- - Background fetch for offline storage
-   https://github.com/google/shaka-player/issues/879
- - PlayReady "recommendation" key system support
-   https://github.com/google/shaka-player/issues/1495
  - Smaller, more modular binary
  - Official TypeScript defs, generated from source
    https://github.com/google/shaka-player/issues/1030
 
-v3.1 - 2020 Q3
+v3.3 - 2021 Q3
+ - Background fetch for offline storage
+   https://github.com/google/shaka-player/issues/879
+ - Shaka Analytics Component and an integration with BigQuery Analytics
+   https://github.com/google/shaka-player/issues/3359
+
+v3.2 - 2021 Q2
+ - MediaCapabilities to make performance-based decisions
+   https://github.com/google/shaka-player/issues/1391
+
+v3.1 - 2021 Q2
  - Low-latency live (LL-HLS, LL-DASH)
    https://github.com/google/shaka-player/issues/1525
  - Own CEA parser, use mux.js only for TS