0.9 with backwards compat