Heavy and Extra-Heavy Oil Upgrading Technologies by