lots of editing, v0.5