FS-47 FS-48 code review