Reworked output to file system.