diff --git a/matrix_webhook.py b/matrix_webhook.py
index 6bc0e67..3780b28 100755
--- a/matrix_webhook.py
+++ b/matrix_webhook.py
@@ -2,6 +2,8 @@
 """
 Matrix Webhook
 Post a message to a matrix room with a simple HTTP POST
+v1: matrix-client & http.server
+v2: matrix-nio & aiohttp
 """
 
 import asyncio
@@ -9,17 +11,15 @@ import json
 import os
 
 from aiohttp import web
-from matrix_client.client import MatrixClient
+from nio import AsyncClient
+from nio.rooms import MatrixRoom
 
 SERVER_ADDRESS = ('', int(os.environ.get('PORT', 4785)))
 MATRIX_URL = os.environ.get('MATRIX_URL', 'https://matrix.org')
-MATRIX_ID = os.environ.get('MATRIX_ID', 'wwm')
+MATRIX_ID = os.environ.get('MATRIX_ID', '@wwm:matrix.org')
 MATRIX_PW = os.environ['MATRIX_PW']
 API_KEY = os.environ['API_KEY']
-
-client = MatrixClient(MATRIX_URL)
-client.login(username=MATRIX_ID, password=MATRIX_PW)
-rooms = client.get_rooms()
+CLIENT = AsyncClient(MATRIX_URL, MATRIX_ID)
 
 
 async def handler(request):
@@ -27,32 +27,40 @@ async def handler(request):
     Coroutine given to the server, st. it knows what to do with an HTTP request.
     This one handles a POST, checks its content, and forwards it to the matrix room.
     """
-    data = json.loads(request.read().decode())
+    data = await request.read()
+    data = json.loads(data.decode())
     status, ret = 400, 'I need a json dict with text & key'
     if all(key in data for key in ['text', 'key']):
         status, ret = 401, 'I need the good "key"'
         if data['key'] == API_KEY:
-            status, ret = 404, 'I need the id of the room as a path, and to be in this room'
-            if request.rel_url[1:] not in rooms:
-                # try to see if this room has been joined recently
-                rooms = client.get_rooms()
-            if request.rel_url[1:] in rooms:
-                status, ret = 200, json.dumps(rooms[request.rel_url[1:]].send_text(data['text']))
+            status, ret = 200, 'OK'
+            await CLIENT.room_send(room_id=str(request.rel_url)[1:],
+                                   message_type="m.room.message",
+                                   content={
+                                       "msgtype": "m.text",
+                                       "body": data['text'],
+                                   })
 
-    return web.Response(text='{"status": %i, "ret": "%a"}' % (status, ret),
+    return web.Response(text='{"status": %i, "ret": "%s"}' % (status, ret),
                         content_type='application/json',
                         status=status)
 
 
 async def main():
+    """
+    Main coroutine
+
+    matrix client login & start web server
+    """
+
+    await CLIENT.login(MATRIX_PW)
+
     server = web.Server(handler)
     runner = web.ServerRunner(server)
     await runner.setup()
     site = web.TCPSite(runner, *SERVER_ADDRESS)
     await site.start()
 
-    print("======= Serving ======")
-
     # pause here for very long time by serving HTTP requests and
     # waiting for keyboard interruption
     await asyncio.sleep(100 * 3600)