Finishing edits from last night