Changed && to ||