new files and fix