Final class edits...