adding parallelism + better file name support