changes
Mergine in the class structure