fixed where and added /or