Making initial state correct!