Making some adjustments to the URL class