make the necessary changes and rename to FOA