Comments from Octavian (@mr_octavian)