Upgrade to FM 1.2