changed classes structures