replaced the rest of hardcoded URLs