More work on FS