Disney’s D23 has had a lot of great news for Kingdom Hearts 3, and one of them is that you will get a much larger party than the series’ previous hard limit of 3.

Looking at the trailer, we see Sora fighting with Donald and Goofy, but also alongside Buzz Lightyear and Woody all at once. Previously, you were only entitled to two companions in your party when laying the smackdown in any given world and frankly, this is great!

They haven’t mentioned a cap on party size though, but having anything more than 3 is pretty good because it means we no longer need to swap out either Donald or Goofy just to incorporate that world’s hero.

Kingdom Hearts 3 launches sometime in 2018 for the PS4 and Xbox One. Check out the latest trailer below!