* add header and deal with faf completion