FS-24 Reviewed code