FS-1 FS-2: Codereview and changes for our protocol