further workflow optimisation