next commit on 0.6