refactor step to use new call system