Changed step/question strategy