Prepare for OF 56 and OTH 34

Prepare for OF 56 and OTH 34