FS update closes #19