file1 improvements
fixed merge conflicts