Step iteration added, classes were fixed