cleaned up range and allow non local server