change to a class struct