Updated state chart :-)