Comments from Errol (@errol_nardan)