refactoring to proper url.