Using the new URL definition. Changing calls to URL to reflect this.