added checks in step method