updated for OF 0074