Comments from wouter nuytten (@WouterNuytten)