modified o_id, added modules param