Update for OF2