Added some more steps