Update to Flow 2.2