Updated to use refactored source. Uses more stable FS functions