more work on 3.0