Slight update to fa tool.