missing steps new look
Fixed merge