work with new build_suite