refactored server access