changed class struct