#645: changes for states