Opcom, minor modification