Modified to work with faa.r

Modification to work with faa.r