Change FA data structure; break a lot of things