Feature/rsf eof