Better replacement of states