Going on on StateChart
merge conflict fix