Change FA data structure again; fix things