don't think "or None" should be needed (None or None) is None