Correct OR to AND ( d'oh, that's what I get for rushing! )