Newly Added States, as well as a Decorator Design Pattern to randomize the final states even more