Polishing FA2 doc