added other parallel steps managing and some improvements