EJ-60: updated with latest FX