Comments from Andreas Eri (@aeriio)