We need to extend this to OWOing also.