It’s a monumental challenge to create any cinematic universe, let alone one that encompasses ten years, twenty movies, a bounty of beloved characters both famous and obscure, and dozens of directors and screenwriters. Of course that’s exactly what Marvel has accomplished over the last decade, as the MCU has become an unstoppable world wide phenomenon at the box office.

However, with that many interconnected stories one issue has seemingly been unavoidable: continuity. Not every movie has lined up in a logical way. Apparent contradictions have led to many fan debates about how all the pieces fit together, but it’s an argument that might have just been snapped out of existence. Today’s Nerdist News with Jessica Chobot looks at how the official Marvel timeline has fixed some of the MCU’s most glaring continuity errors.

Marvel Studios: The First Ten Years, the studio’s new book looking back at the franchise’s first decade, features in-depth write-ups for all the movies, along with interviews with its stars and executives. But one of the most intriguing sections includes a new, official timeline addressing many continuity issues fans have raised. Some movies, like 2008’s Iron Man (now set in 2010) have been moved, while others with unclear settings have been firmly placed alongside other films. Even some seemingly problematic references now have logical explanations.

Well, except for that Homecoming/Battle of New York problem. We might need a time vortex to explain that one.

What do you think? Does this correct all of the timeline issues? Or did it create all new ones? Take the time to tell us what you think in the comments below.