Now using status message instead of states code.