Changed and to or