Lausanne version. Working and stable (kind of)