Re-porting to OS2