Demarcation: update comments