Some more work on security.