Experimental no-id version