anchor.diff:  		   Socket,
   		   S#state.local_peer_id,
   		   S#state.info_hash) of
  -		{ok, _ReservedBytes, PeerId}
  +		{ok, _Capabilities, PeerId}
   		  when PeerId == S#state.local_peer_id ->
   		    {stop, normal, S};
  -		{ok, _ReservedBytes, PeerId} ->
  +		{ok, Capabilities, PeerId} ->
  +		    FastExtension = lists:member(fast_extension, Capabilities),
   		    complete_connection_setup(S#state { tcp_socket = Socket,
  -						        remote_peer_id = PeerId});
  +						        remote_peer_id = PeerId,
  +						        fast_extension = FastExtension});
   		{error, _} ->
   		    {stop, normal, S}
   	    end;
   	{error, _Reason} ->
   	    {stop, normal, S}
       end;
  -handle_cast({complete_handshake, ReservedBytes, Socket, RemotePeerId}, S) ->
  -    ReservedBytes = [],
  +handle_cast({complete_handshake, Capabilities, Socket, RemotePeerId}, S) ->
  +    FastExtension = lists:member(fast_extension, Capabilities),
       case etorrent_peer_communication:complete_handshake(Socket,
   							S#state.info_hash,
   							S#state.local_peer_id) of
   	ok -> complete_connection_setup(S#state { tcp_socket = Socket,
  -						  remote_peer_id = RemotePeerId });
  +						  remote_peer_id = RemotePeerId,
  +						  fast_extension = FastExtension});
   	{error, stop} -> {stop, normal, S}
       end;
   handle_cast(choke, S) ->
  
positive.code: 		 local_peer_id = none,
  		 info_hash = none,
  
  		 pieces_left,
  		 seeder = false,
  		 tcp_socket = none,
  
negative.code:     gen_server:cast(Pid, {endgame_got_chunk, Chunk}).
  
  %%--------------------------------------------------------------------
  %% Function: complete_handshake(Pid, Capabilities, Socket, PeerId)
  %% Description: Complete the handshake initiated by another client.
  %%--------------------------------------------------------------------
  complete_handshake(Pid, Capabilities, Socket, PeerId) ->
      gen_server:cast(Pid, {complete_handshake, Capabilities, Socket, PeerId}).
  
  queue_pieces(Pid) ->
      gen_server:cast(Pid, queue_pieces).
  