A couple of modifications for WIPO
A couple of modifications for WIPO