When Spider-Man: Homecoming was released earlier this year, Marvel got in a bit of a pickle because the timeframe in the movie kind of ruined the rest of the MCU timeline. The opening sequence of the Spider-Man makes it clear it it takes place eight years after The Avengers (2012), but it is not technically eight years later, that would be 2020.

This minor detail has haunted Marvel aficionados as well as Marvel Studio President Kevin Feige, who is ready to established a concrete timeline for the MCU.

In an interview with CinemaBlend, Feige reveals that an official Marvel timeline is on the way. He also opened up about other details of the dates in the movie, saying specific dates are not included in Marvel movies on purpose. In the end, everything will tie in neatly through the use of the same timeline trick used for Star Wars. The MCU is getting its own Battle of Yavin timeline.

Here are Feige’s complete comments on the revamped timeline:

The specifics of the timeline, looking at… I’ve loved timelines, I love the Star Wars timeline, with the Battle of Yavin, everything is either After The Battle Of Yavin, Before The Battle of Yavin. We’re doing that, and the origin point for us is Tony saying, ‘I am Iron Man.’ So everything will be years after that, years before that — to the Big Bang, which is where it starts! It will look very cool and complex like Doc Brown on a chalkboard by the time it’s published.

Instead of having a simple chronological order of movies, the MCU timeline will use the “I am Iron Man” as the zero event. Everything that happens in the MCU will be subservient to this event. It will be a much simpler method to clean up the messy timeline MCU movies have.

Feige didn’t open up about when Marvel would release this new timeline clarifying all the inconsistencies with the current timeline, but at least we know Marvel is addressing the annoyance.

The next Marvel movie on the docket is Thor: Ragnarok, opening on November 3. All we know about its place in the timeline is that it takes place two years after Avengers: Age of Ultron.