Last batch of edits for now