Simplify and bug-fix Tunnel