Some improvements
More states