small object oriented change