FAP modernization