Final updates for functional flow