Some updates to FA