Shift functionality out of Update method to getBaseUrl method
Edit getbaseUrl method
More edits to the getBaseUrl method