Adjusted related work with Paolos changes