changed to or, added test