class structure fixed