Adapted the multiple files and nice utput...