Updated for external url use