Addressing Mihai's review