Modernise, implement concurrency