changed to use one baseUrl