Security that appears to work somewhat better, and has less recursion errors