updated to use original_url