Adjusted to latest Webternet changes