Update to Brad Davis