Changed how states are called