Updates

Most up to date edits