changed many fields to private