Reorganize steps ;-)