Make finalize into two queues