Starting work on 3.0.7