Put updated OMR from master back in