DEVIDM-93: Working on states.