added another state
removed unused function