Fs - improving and fixing