improved handling of user modified files