Added SocketShuttle
Updated SocketShuttle