Changes for OF1