v2
a few more edits