refactored server location