url changes
added some error handling