Some edits...