Initial Edits for common files