some more commits to 3.0 prototype