FN CLean up 2 ...