further changes to make the urls not mandatory