       @arranged = {}
 
     start: ->
-      if @arranging
-        @tell(Protocol.TEAM_PREVIEW)
-        @shouldStart = false
-      else
-        @tell(Protocol.REARRANGE_TEAMS, @getArrangements()...)
-        @shouldStart = true
+      @tell(Protocol.TEAM_PREVIEW)
+      @shouldStart = false
 
   extendFacade:
     arrangeTeam: (playerId, arrangement) ->

        return false  if !team.pokemon[index]
        return false  if arrangement.indexOf(index, i + 1) != -1
      if @battle.arrangeTeam(playerId, arrangement)
        @battle.startBattle()
        @battle.sendUpdates()
      return true


    getArrangements: ->
      for playerId in @playerIds
        @arranged[playerId] || [0...@getTeam(playerId).length]
