- modified order class structure