Two more functions finished