ntunnel, and db changes