should work with 2.0 as well