added --server back