edited origin class structure