Added more states and started using null.