improved build flow