code sync'd wit new server interface