V0.7 no change from 0.6, still prob with assert and lock