fixed where and added /and