Finish edits to fit new DB