Changing to use value member