modified server clarity