Finalize ticket 2790