Modified the way files are gathered