added info for non server