Changing and -> or based on conversation in #4532