Closed #30 by adding a poor state system