update files and simplify