Experimental click-through feature added