Added some more stages and states