Implement Ingrid's remarks (II)