core: reworked workflow