FS class improved