working on FS implementation