Upgrade to Guard 2.0