add handling for O'Connor