Need to make changes in do_partial_prim and do_consolidate