more work on getting 2.x running