Edits for final drafy