added url handling