Pint-sized puzzler Captain Toad: Treasure Tracker will be snooping around for hidden riches on 3DS and Switch this summer, Ninty announced during its recent Direct broadcast.

Originally released on the Wii U to little fan fare, Captain Toad will be enhanced on Switch and 3DS with a bunch of new features, such as additional stages based on the excellent Super Mario Odyssey, as well as touchscreen and 3D functionality for the handheld version of the game. 

In addition, the Switch edition will include multiplayer support, with one player controlling the plucky treasure hunter himself with a Joy-Con while a mate gives you a hand against enemies using a second pad. It's pretty fitting that Toad is making the jump to Nintendo's hybrid console, seeing as how he had a cameo in Mario's latest adventure.

Captain Toad: Treasure Tracker will launch on 3DS and Switch on July 13.