OEM tested and working

Part#837