some changes to change the current step on timeout events