Updating the FAP after suggestions and more questions