change to single file system again and conditionally include that