changing and to or