Changes for ordering and distribution issues