Took out client ip argument