better marked build support