diff --git a/2.5DHero/2.5DHero/Network/GameJolt/GTS/GTSTradeScreen.vb b/2.5DHero/2.5DHero/Network/GameJolt/GTS/GTSTradeScreen.vb
index 7819af1ec..56ed76981 100644
--- a/2.5DHero/2.5DHero/Network/GameJolt/GTS/GTSTradeScreen.vb
+++ b/2.5DHero/2.5DHero/Network/GameJolt/GTS/GTSTradeScreen.vb
@@ -54,7 +54,8 @@
                     PokeIndex = -1
                 End If
                 If New Rectangle(780, 560, 32 * 5 + 64, 32).Contains(MouseHandler.MousePosition) = True Then
-                    Core.SetScreen(New PokemonStatusScreen(Me, 0, {D.Pokemon}, D.Pokemon, False))
+                    Core.SetScreen(New SummaryScreen(Me, {D.Pokemon}, 0))
+                    ''Core.SetScreen(New PokemonStatusScreen(Me, 0, {D.Pokemon}, D.Pokemon, False))
                 End If
                 If New Rectangle(520, 560, 32 * 3 + 64, 32).Contains(MouseHandler.MousePosition) = True Then
                     If MeetsCondition() = True Then
diff --git a/2.5DHero/2.5DHero/Overworld/OverworldScreen.vb b/2.5DHero/2.5DHero/Overworld/OverworldScreen.vb
index 21f8217ad..13383ac7e 100644
--- a/2.5DHero/2.5DHero/Overworld/OverworldScreen.vb
+++ b/2.5DHero/2.5DHero/Overworld/OverworldScreen.vb
@@ -173,7 +173,8 @@ Public Class OverworldScreen
         If ActionScript.IsReady = True Then
             If MouseHandler.ButtonPressed(MouseHandler.MouseButtons.MiddleButton) = True Or ControllerHandler.ButtonPressed(Buttons.LeftStick) = True Then
                 If Core.Player.Pokemons.Count > 0 Then
-                    Core.SetScreen(New PokemonStatusScreen(Core.CurrentScreen, 0, {}, Core.Player.Pokemons(0), True))
+                    ''Core.SetScreen(New PokemonStatusScreen(Core.CurrentScreen, 0, {}, Core.Player.Pokemons(0), True))
+                    Core.SetScreen(New SummaryScreen(CurrentScreen, Core.Player.Pokemons.ToArray, 0))
                 End If
             End If
         End If
diff --git a/2.5DHero/2.5DHero/Screens/PC/StorageSystemScreen.vb b/2.5DHero/2.5DHero/Screens/PC/StorageSystemScreen.vb
index 60e19adac..df0080795 100644
--- a/2.5DHero/2.5DHero/Screens/PC/StorageSystemScreen.vb
+++ b/2.5DHero/2.5DHero/Screens/PC/StorageSystemScreen.vb
@@ -1004,14 +1004,15 @@ Public Class StorageSystemScreen
 
     Private Sub SummaryPokemon()
         If CursorPosition.X = 6 Then
-            Core.SetScreen(New PokemonStatusScreen(Core.CurrentScreen, CInt(CursorPosition.Y), Core.Player.Pokemons.ToArray(), Core.Player.Pokemons(CInt(CursorPosition.Y)), False))
+            Core.SetScreen(New SummaryScreen(Me, Core.Player.Pokemons.ToArray(), CInt(CursorPosition.Y)))
+            ''Core.SetScreen(New PokemonStatusScreen(Core.CurrentScreen, CInt(CursorPosition.Y), Core.Player.Pokemons.ToArray(), Core.Player.Pokemons(CInt(CursorPosition.Y)), False))
         Else
             Dim id As Integer = CInt(CursorPosition.X) + CInt((CursorPosition.Y - 1) * 6)
             If GetBox(CurrentBox).IsBattleBox = True Then
                 id = GetBattleBoxID()
             End If
-
-            Core.SetScreen(New PokemonStatusScreen(Core.CurrentScreen, GetBox(CurrentBox).GetPokemonList().IndexOf(GetBox(CurrentBox).Pokemon(id).GetPokemon()), GetBox(CurrentBox).GetPokemonList().ToArray(), GetBox(CurrentBox).Pokemon(id).GetPokemon(), False))
+            Core.SetScreen(New SummaryScreen(Me, GetBox(CurrentBox).GetPokemonList().ToArray(), GetBox(CurrentBox).GetPokemonList().IndexOf(GetBox(CurrentBox).Pokemon(id).GetPokemon())))
+            ''Core.SetScreen(New PokemonStatusScreen(Core.CurrentScreen, GetBox(CurrentBox).GetPokemonList().IndexOf(GetBox(CurrentBox).Pokemon(id).GetPokemon()), GetBox(CurrentBox).GetPokemonList().ToArray(), GetBox(CurrentBox).Pokemon(id).GetPokemon(), False))
         End If
     End Sub