final with all files working