Added ability to change states