fixed step3/4 issues

Finally!!