Updated for ff32