FS-10 FS-12 review changes, also added to main