Initial edits...
Updates