final edits...noticed changes weren't committed