Port edit

3rd Commit