update marco resolve, cv_init added.