There are a few things you can always count on in a Marvel movie: Post-credits scenes, superheroes played by handsome men named Chris, and, if Tony Stark’s involved, you know he’s going to be sporting some new Iron Man armor. And thanks to a fresh batch of set photos, you don’t have to wait until Avengers: Infinity War hits theaters in 2018 to check out Stark’s sleek and shiny new upgrade.

The new photos feature Robert Downey Jr. (or his double, anyway) in full Iron Man costume on the set of Avengers: Infinity War, alongside Doctor Strange (Benedict Cumberbatch), Wong (Benedict Wong) and Bruce Banner (Mark Ruffalo). Unsurprisingly, it looks like Tony Stark’s been tinkering with that high-tech armor yet again…well, maybe.

JustJared, but here’s a quick sneak peek:

Hmm. Is Tony Stark’s latest suit inspired by Pepper’s “Rescue” armor, or is he taking her gear out for a spin? Per JustJared, Robert Downey Jr. was spotted on the Infinity War set filming a similar scene, and given that the double wearing this suit is male, it doesn’t seem likely that this is meant to be Gwyneth Paltrow’s Pepper (although I would love to see Pepper back in that suit).

Avengers: Infinity War also stars…well, pretty much everyone in the MCU. It hits theaters on May 4, 2018.

More From WRRV-WRRB