Changed initial state PROPERLY