Prepare for OF 40

Prepare for OF 40