more work to get things working with 2.0