this should be eventually factorize to be common with steps.py