Updated for finalization