Sync NO driver with the NORID version