Updated for FC 0.90