Add ffap-improved