AFP modernization