First draft of 3.0.7

Not working