Fixed to match new API URL's