first batch of edits