Additional file edits from initial port