Tunneling improvements