fcodes improved