Experimental changes to run with 1.8 AND 2.0