Fixed the Bugs and added missing steps

This line should be removed