combined server methods into 1 method
combined server methods into 1 method