added all files
changed behavior