more v1 edits